Basic classes added