Add role filtering, last step