Added more for client script