Add meta information
-Initial refactoring