Partial implementation of mask table; removing model driver modules