Added Constant data storage
Updated registration init