Adding 5.* compatibility