Improved call out handling
Added default action