Updated bind and events modules