Updates to post-fs-data