Refactor Inversion. Simplify creation.