Refine ORM annotations and remove @author