Changes for Forge API support