Simplified args and added minimal event handling