Added no decoration support in client