Correct properties management
Adding support for simple examples