Add lot of override features