add some feature from stub