Client and Common added