More converstion to SQLAlchemy