Fixes #30 - Add support handlers