-- Migrated to Spring IoC