Added stuff for client