Add more behavior