Add session and ability to filter result