Fix #3: Feature scheduler support