Finished upgrading parsing class to handle array and complex type properties separately