Add support for several more perperties.