Add more responsibilities