Made usage of StaticContent less convoluted.