[WIP] - Rails 3 support