Move more to the prototype