Mint check and properties refactor