Updated to build with dependencies