Issues with deprecrated functions