Moving more stuff into the xpdo Asset class... it's easier that way.