Add more functionality