Adding back infrastructure project and more libs