Updated factory to use nbc when appropriate

- Fixed error where incorrect type was created in Factory