fixed cyclic namespace dependency caused by defining generic and function for PedClass
merged changes in namespace from local branch