Moved to database design package