Added core features