Add more method and test