Added decorator for filter, renamed functions