Modified to include static contents + templating