Cleanup & Add handlers