Follow-up I49b7d8a - Add api module for common metadata