Added filtering possibility.