New database schema for 0.2