Nexus:
 - fix Entity
 - timestamps