Update activate implementation