Added proporsal for new db schema