Added handle for @return