Maybe we can move ```extend``` to Utils?