A bit of rebuild for new functionalities