Refactor template and added support for constructors and rest of annotation locations