16 and 17 items from bug list (add hibernate properties)
20 and 21 items from bug list (refactor method name)