Add support for sub configs
Fix env adapter py33 compatibility
Remove buggy commit side effects