Add possibility to return values