Several improvements to the EF5 extension