Fixed design flaw by removing raven db