Change Part to be a POCO