Split out api concerns