Add smart expand method and remove useless methods.