Fixing name value for property list and added some type checks here and there