Improve static references