Support newer version of Apartment