Moving from hibernate templates to pure hibernate, work in progress