Factory modification for BB5 autoloader compatibility