Implement handler plugin feature #1