Changed Database Structure - not implemented in views yet.