Reworked for new APIs