Entity manager conversion & unit of work changes