Update objectives
Add basic tags