Stabalized existing data functionality