Add API + Refactor services