Move to proxy for static info