Updated EntityWrapper and workflows