Feature/grouped error codes