Changed to extras prefixes in the api instead of a dict-like format