Added annotations to mapper classes