Updated with some swift conversion classes