Added todo
Fixed local class error in prepare