Add more robust feature