Added support for static