New config format

Supporting commands and more than one property for includes