added namespace, added configuration check