Start working on decoupling render entities