Configuration and template overriding added