Fixing missing dependencies, adding strong-naming