Add critical functionality