add some missing stuffs