Added POCO classes missing from last commit