Added annotations file, updated base and templates