Changed DB-structure to improve performance