Added Scheduling and Tagging functionality