Some fixes, added in return class

Return class is not tested yet