Initial support for client side decorations