Add metadata and services stubs