Updated packages and changed GenericBusinessBuilder for Common implementation of GenericBuilder