Move some properties to file.
Note before enhancing.
Oops!
Work in progress.