Add more behaviour