added namespace resolution