Also fixed the attribute restrictions modules