Feature/rails compatablitiy