Stable version with all structural changes from Mopo done.
Parameter type changes
Alternative for the entity