Node system expanded

New classes added