Several changes to make the core work.
Set as annotated the correct values.