Added and modified various poc classes