Added filtering and permission behaviour