COMMENT: Add class wide meta data, change to strong name