Refact. Add Force param