Fix supermaster functions as it requires an id in the database