made some imports optional