Updated handlers to allow non-function