Prototype improvements