Added --force flag support