Add content into errors
Rename hakuRepository variables
Remove unnecessary local definitions of services