Modified to use cfn_converter
Merge branch 'feature/use-cfn-converter' into develop