[MAJOR] Change to new API layout