Updated basic components