Updated API to work with extra filterting