Renamed common to api