Added missing basic stuffs