Cleaned up permission structure