Added schedulation