added scheduling support