Add callable default support