FIX: Better writing support