Build args refactor done