Reworked API