add return statement support