Added entities validation
Added Delay entity