Update Forge
Cleaned field access