Fix rights issues. Again
Implement adding as service