Made more Xcode friendly