Add few missing codes