Ticket #1041: Updating features