Sysmount refactor