Added new functions (to be defined) and data types