Added better xcode support