Removed the compound property and made all unit tests pass