Fixing up structure for future development