Initial hooks for system.api