Several hatches improvements and unifications