Variable filenames for handlers

Fixes #2