Changes as per planet argon for rails active support gem