Implement basic add/remove tenant functionality