Added handler functionality, and filter functionality.