Add better handling