More domain classes added

Resolved all existing errors