Fixed missed properties
Fixed code duplication