Handle default needs to take kwargs