Added base functions and types