Added mapping for non primitive classes