Removed active support dependency
Added I18n support