Will use standard queue in future