Updated structure and some boards