Few base updates