Add support for completed property