Add return management