Adding the handle and decorator modules