Add more API finalization and other stuff