Better assistant managment