changed guard types from EString to AtomicEP

also applied some model changes