Fix phpdoc
Fix phpdoc and return statements
Add the service manager as the interface implementation