Added filtering to ProjectFactory