Better property manager and user macros support.