Resolution of callouts and enhancements