First version of domain classes added