Fix some entity issues. Add customer manager as service.