Finish prefixing and add error enum