Added Schedule and some improvements