Changed database schema to provide more performance and to store more information