Split it out from the monolith