Add missing property and improve code