Use standard imports instead of Oscar custom ones