Add lot of awesome features