Did some refactoring and worked on property expansion