Added error handling and base templates