Refactor to add a Prototype