Migrated from basic repository