Add more dependencies, and make sure contrib modules are built & installed