Strict mode, $resource restructure, note/tag restructure