Fixed DataFactory, adding charts - not finished