Making Generic

Make ECF generic