Added filters.
Updated docblocks.