Updated to include static content