Adding support to ACCEL on dataStorage, fixing some indentation problems
on ACCEL as well. Changed dataStorage include position so it can be
accessed on other included files.