Lightweight prototype additions