added object class defenitions
merged