More API additions. Almost at the same level as before