Fixed dependency and added missing file