Added stuff for xcode
Added classes from emiax downstreams