Small changed to my scheme data structure