added force due to old schema conflict
added dynamic scopes for code
import appears to be work