Complete TODO items in Common.java