[CHANGE] ElementFragment related modifications