Updated options
Move dataitems to abstract class