Replace activesupport dependecy with addressable