Updated HsBuilder to the new data structure