Updated basic functionality