Added action and filter hooks