Re-adding 002-005 legacy