Added Gap specs. Make some unity changes