Add Node class
Add Type class
Update  checks. Add new fields to return object
Remove unused code. Add list placeholders