Fix Prototype method to reduce dependencies and minimize new class creation