Added more constatns for filter