Simplified event binding
Added offline support