Added some basic handler functionallity.