Refactoring in process...

Added based integer values, physical literals.