Beginning of JPA* + Refactoring OM*