Adding awesome features