optimize imports
extended workplace to support more fields