Upgraded interface, scheduler stuff