Support separate home and build state