Replace activesupport dependency with addressable