updated ot include api attributes etc.