Added some useful definitions and packages
Updated placeholders and added term env