Improve signatures