Refactor and adding size filters