[feature/1.0] updates to support flapjack 1.0.0