fs container related changes