Optimized names, more options