Added new template inheritance and some additional core features.