Reimplementation of Handlers.hs and inclusion of Internal.hs