Fix structure to match coder app