Fixed: parsing return values
Added environment decoratos