Added andReturn support