Updated for full defaults