Switch to CDI including majore refactoring. JPA doesn't work properly yet... so it *wip*