Ok I'll revert this commit with changes in DB schema