Added return value support
Added default return value