Added ER, OR and SFP