Added missing handlers