updated entity and scheduler modules