Added actions and filter support (2)