Streamlined the database