Refactored bootState