Added changes to common.dart