added new structures to setup