Started change annotations to mapper classes