More changes to use conventional cell for elastic contant