Added more stuff to be used on client.