Tweaking startup sequence. Adding entity properties.