Replaced some deprecated features