Updated to use constants via environment.rb