Use adapter in Raekke core instead