Change to support folder boot