Moved data.h's definitions to data.c