Temp fix for Spring nonsense. Replace interface with implementation