Add support for excluded users