Updated field prefixes. Streamlined snippets