Fix importing, Fix rails support