Add return  in some methods