Initial support for static dirs