Fixed docblock and added missing uses