Making Generic

Making the ECF generic