WIP: More Rails compatibility