Added default keys
Switched to key defaults instead of init