Fixing schema and back to Ruby2