New bundle, cleanup and database entities