Added better merge with defualts options