Add issue #215 - scheduler API