Updated controller methods