Option to force rebuild