Add exp handlers

Reviewer: @rlane