added namespace and yaml support