improve signal support