Put AWS model at top-level in class list
Add hack to parse nobrowser macro