Improve declarations