Implemented new structure preparing for sequalize