Added clientside wrapper