To add data and improve events controller