Added data.h/m files for singleton