Added class and method templates