Adding some more changes for one support