Migrated project to Spring