Adding in more missing code from default.rb