Completed work on signals extension