Added base node classes