Supportive

Change code to use ActiveSupport