Changed handlers as service seems to fail