Refactor for 6.1 and builds