Design changes (Close #82)