Added cloudformation mode