Add support for required clientID parameter