Add some funtionality