Fixed default options support, added clone helper