Change to a clearer api