add context and signals