added entities and util modules