Initial implementation of the add/remove tenant APIs