Migrated to spring data