[BISERVER-12261] Adding more import classes