Added most base functions