Replaced uses of deprecated API