Feature/return deferred