Made imports consistent, made default work