Add proper events