Properties and constants refactor and definitions, and available parents handling