#330 - REFACTOR: Improve properties and descriptors logic