Current implementation is enough IMO and should not be changed.