[ADDED] New base structure for 0.0.9