Temporary hack to make sample data work. (pending on Richard's changes)