Complete integration of Aditya's manager functions