Update Content module
Optimize SQL, project and database calls