Add core features