Updated datamodel to allow for runnables and prepare for updating of comments