Modifications for Ruby 2.0 Compatibility