Slightly changed API for client creators