Added functionality to respective functions