Add checks in lift