Implement the new auto queue within the new classes