Added number conversion on data load