Controller filters; Add statemachine