Correcting various code quality issues
Updating data manager agent