add property declarations and remove timeout check from client