Added singnal handling