Moved property declarations to class extension