Removed active_support dependency