Updated basic definitions #73