Adding new features (map, cell, bootstrap)