Added Diff for better Features management.
Cleaned up permissions.