Add permission filter and some stuff